Moving eject into own class