Fixed some auto-complete & return points

Nothing revolutionary, but might help development with IDEs 
please keep the empty line between the param annotation and the return one