Updated to add new docblocks, language and use strict