#20 Style improvements