Worked on cleaning up setup process