some style changes
re-starting from here