Cleanup and some minor styling changes