Style improvements and polish