Minor cleanup and adding subject to input params
Removing old domain object.
Converting tabs to spaces.