cleanup code and added other modules