cleaned up formatting (bigger tabs), moved regex expressions 

as requested...