Fix for code style guidelines