Refactor + Style Fixes