Improved code style a little bit