Cleaned up my previous commit