Improvements

Minor code improvements. Removed excessive params.