Style and Fixed Core Issues