Removed logs
Improved indentation