Code is really nice now