Usability Enhancements

Consolidated code to make things run faster.