Add classes for remotes, cleanup code