cleaned up use of defaults