Final code style I hope