Adding some doc blocks and replacing Carbon:: calls with self::