Clean up and extracting static operations