cleaned up the code for a bit