Removed extra header details. Moved items into methods