Bug fixes

Fixed spacing issues, changed indentation a little