CS Fixes

CS fixes to comply with the other league repos.