This is called refactoring and if you have good quality unit tests in place that provide ample coverage then you will be able to confidently refactor your code to your heart's content without introducing new bugs.