Forms improvement. Better style :)