Made last changes - code alignment and such