Improve (?) code style