cleanup code, added linebreaks