Cleaned up the code, better spacing