Fixed issue #1 and added several stylistic changes"