ArARC & non ARC compatible, removed NIB file, refactoring code