Refactoring Done

Code Cleaned Refactoring done. Must Work with small stroke line
graphical glitch