Fixed comments/spacing/indentation