cleaning up code for future use