Cleaned up code formating