Removed debug logs
Reorganised code

- cleaned some code
- now always returns true