Improve naming of machine elements
Rework user_input
Fix missing ';'