Add/remove classes methods cleaned up, elements file done