Clean up imports
Made rebuild and print share code