* Code cleanup (damn you, wrong margin setting!)