Remove specs no longer being used, fix spacing on constants