COde clean up