Cleaned up code, removed redundant cars