Fix indentation & Remove unnecessary code