styling and API fixes
Merge pull request #37 from jsimon727/styling

styling and API fixes