Some basic code clean up and better UI