cleanup & fix