Made small adjustments to finish things up #13