Cleaned up some syntax ish