Custom name, bootstrap, code cleanup