code cleanup for future development