refactored code to get rid of stupid passive aggressive warning that would've probably really annoyed Adam