fixed indentation and removed some extra comments for debug