- Code cleanup and added functionality