Adding more private, removing unnecessary code, and organizing imports