Minor Improvements and file consolidation