Replaced bad coding standards eg: size() == 0 to isEmpty(), added @Override, etc...
Signed-off-by:thehutch