added property for cleanup-interval, code cleanup