Apply oop

Can remove this space