Cleaned up logic, updated readme