Added @param to get method.
Some code cleanups