Some cleanup
More conform function declarations