Removed redundant code, fixed desc. and default