Albums title fix + coding style cleanup