Externalized Strings and added final modifers;
Other code formatting;
Removed accidentally added file;