Updated naming conventions, removed handler class, cleaned initialize class