Revision 02

Final Clean Up.