Better formatting and comments on 'end' keyword for associations and collections
Better formatting for checking for custom data storage in data store
Code cleanup on client, associations and base classes
Few small changes, nothing important