Clean Code

Cleaned the code, made it simpler