cleanup & style improvements