Closes #4, closes #5; Fixing some style issues