Separation of style from code almost finished