Fixed code according Java Coding Convention