Removed redundant inherit and small formatting tweaks.