Improved: code style refactoring