Cleaned up auto complete
Cleaned up auto complete further