indent, variable moves
Merge pull request #3 from KevinFXue/Kevin-changes

indent, variable moves