Cleaned up the code to 941