Ran code cleanup, cleaned solution