Added user choice and code cleanup