Refactor; Code Cleanup