Code cleanup + indending fix