Cleanup One

Minor performance tuning, implemented best practices to help prevent NullPointerExceptions due to  calling .equals() with String literal arguments, minor 'Long' formatting to help avoid confusion, and replacing old Javadoc code with newer {@code}.