cleaned up code to be more readable without any tab chars