indentation and other style issues