cleaned up the code a tad