Added more refactored stuff
Added some more refactored stuff