Further preparation

and aded some style