cleanup & improvements