cleaning up code to be more readable...