Fix indentation
Clean up code a little bit