cleans up code a little