Code Refactor - cleanup