Removed some copy and pasted code for modal