~ Refactoring, misc. stuf