increase username length and clean up on header file