Improve usability, remove excess code