Commit 2

Making code stream lined