Added diamond operator to empty list instantiation
Refactored string literals into private static constants
Merge remote-tracking branch 'origin/master'
Removed unused method
Removed test of unused method