Updated docblocks based on scrutinizer