Code cleanup

Just did some housekeeping