Tp clean comments

Reorganized and formatted apps