Improved code style a little