fixing formatting and moving lines.