Code clean-up, integrate Checkstyle for code validation