Cleaned Code and Created Simple Service