Added additional shape functions and formatted files using
astyle.