make code more readable
remove indirect memory access that causes failures on fedora20 and mint