Cleanup and identation :)