Cleaning up initial version