Code cleanup. Dock broken. Will fix next commit.