Final commit with some cleanup