Reformatted and Closes #14