Clean up the code

[munari-l]

• Make sure variable names are consistent throughout all files
• Refactoring
• Remove unnecessary methods or variables