Added Style, Refactored Testing