Increased padding in docblocks
Replaced includes with loader class