Reindented the codebase