fix indention & remove commented out code