Indent files, remove unnecessary returns and made some minor refactors