Clean up usings and added User story 3