Fix docblocks and minor refactoring of __get() method