Fixed indentation and cleaned things up