Some code clean up and visual styling changes