Stylistic changes

Covering comments and array definitions listed in #3