Did a check style pass and improved the UI