Code is working completely; need to clean up.