Adding devise for user control
Making code more readable