Refactor a little. Prepare for slight breakage