beautifying

Small changes to the structure