Updated files in src/ to match style guidelines