Formatting, make strings translateable, naming convention++