still cleaning up code