Refactor internal code (still buggy)