Cleanup and fixing a bug with wrong arguments