Simplification, cleanup and make everything works

yes i know this is the best commit message ever