Cleaned up getline interface
Reduced scope of two constants