initial cleanup

Code functionality and appearance are the same, just cleaned up a bit.