Cleaned up in the code