Refactor code, add help button, long lines