Added 'm_' in front of every class's member
Small adjustments