Cleaned up tab's, white spaces and cleaned the mess of curly braces up.