Cleanup of all function - not any faster though

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>