Additional cleanup and further implementation