Removed unwanted text in fieldbox
Refactoring and renaming
Small design changes
Dealing with returned value