Update: Implementing steps to improve code