v2.8- Code clean up