cleanup & style