Method Rename
Style clean up

Also apparently joining was broken >,<