Cleanups and slightly more permissive regex
Use spaces instead of tabs