Cleaned up chassis and associated classes