Finally cleaned up BASE.js :)