minor improvements and styling