Initial commit with some cleanup