code cleanup for andym!