Style formating

Auto generated comments are removed and the code is more formated