cleaned up the code a bit before bed