Initial commit - code cleanup required