minor restructuring and title placeholder