Refactoring + minor fixes
Refactoring + minor fixes

24HOURSMEDIA/capifony,pedroresende/capifony,pimolo/capifony,24HOURSMEDIA/capifony,korobi/capifony,everzet/capifony,korobi/capifony,trsteel88/capifony,jeroendesloovere/capifony,trsteel88/capifony,shipci/capifony,everzet/capifony,pedroresende/capifony,jeroendesloovere/capifony,pimolo/capifony,shipci/capifony