Added DocBlocks
Updated config for readability