Margins + code cleaning ...