Remove default values && add check for size existance
Minor changes: renaming, comments, etc.