cleaned up/commented code, put data in separate file