Add style and minor fixes