Worked on cleaning code up