Fixed: Coding rule issues.