Removed useless logging entries
Syntax cleanup