#21 - Cleaned Code

Removed all Debugging and unnecessary entries