Added manager class to perform updates
Code cleanup, comments added