Removed unnecessary defaults
Fixed else positioning