Code

Added comments and updated management class