cleaned up code from night 1