Revision 16

Cleaned up code