Changed few syntax issues, resolved some Checkstyle