Fixing some stylistic issues. Closes #24, #23, #16, #15, #14, #13.