Cleans up code a bit, maybe?