further cleaned up code, got it to compile without error