Trimmed trailing whitespaces.
Converted tabs to spaces.
Renamed entity.
Removed non-useful bloat methods.
Converted tabs to spaces.