Slight code style improvements