Refactored Java Code - Excluded classes