Tidying up naming and indentation
Merge branch 'master' of github.com:chengsoonong/rede