Adding "trait" searching for the class handler.
Also, fixing the function end comment function
Now adding an optional ending to classes/interfaces/traits too. :)