get rid of couple of @:functionCode's