Remove un-needed underscore from include
Clean up some styles