rubocop & prompt improvements