Fixed style
Added assertion message
New plans