Refactoring some parts of the code to obj-c style