Passing more values properly

removed more % surrounding calculations resulting in passing proper
values instead of results of returning values