Cleaning up code to personal tastes