Refactor, correct indentation, overall cleanup