Checkstyle corrections, Knight finished