Feature/simpler code