Refactoring
CS fixes