Cleaned up the code looks better