cleanup
getting a proper code style up in here