Cleanup PR. Does not actually change how things work.

Makes methods more efficient such as how strings are concatentated and removing manual array copying in some arrays. Added @Override Annotations in a few areas.