80 line character limit and header cleanup