CS fixes, refactoring, typo +++