Code cleanup, switching to ARC

not completed yet.