Product Work 6.1

Cleaned up a bit of the code within the classes, Views included.