Removing unnecessary break
Separating helper files
Separating helper files