Cleaned up some code, added README