Base: Code clean up