separated to individual files
cleaned up