Cleanup and changing error delimeters to Bootstrap