refactor

stylistic changes - although this is due for a general refactoring.