[CLEANUP] Refactor validate code based on Java Coding Convention