Style improvements. Thanks at evilpie for the hints!