Argha - code cleanup