In progress Upgrade from mongodb to SQLAlchemy

Updated Spacing too