Comments and seserver-side refactoring