Refactor, code cleanup and consistancy