Simplifying RegeEx and some formatting