Cleaned up method order