Modifications on Payment screen, little code optimization.