Refactored a few cases
Make it green