Reformating and Cleaning up the code
Merge branch 'master' of https://github.com/ianceicys/IanGitHubWorkspace.git