cleaned up and ready for herokuapp