styling changes and cleanup