Other code styling improvements :annoyed: