Removed NUnit and cleaned up code